[dash] Swap More for triangle

In newer mockup.

https://bugzilla.gnome.org/show_bug.cgi?id=600734

diff --git a/data/Makefile.am b/data/Makefile.am
index 1f5857d773b5b8d9a302b1f38693d072a6a62795..912ad3dbe5c01a697ee096574fd30b63bd74d803 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -30,7 +30,8 @@ dist_theme_DATA =                             \
        theme/scroll-button-up.png              \
        theme/scroll-button-up-hover.png        \
        theme/scroll-vhandle.png        \
-       theme/section-back.svg
+       theme/section-back.svg          \
+       theme/section-more.svg
 
 schemadir  = @GCONF_SCHEMA_FILE_DIR@
 schema_DATA = gnome-shell.schemas

diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index f09b81f3c0fe8289bdec205b85b0e043cc0984eb..3e0288477c2c2f222e3cbfbf4cb1475e905d1e89 100644 (file)
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -156,10 +156,12 @@ StTooltip {
 }
 
 .more-link {
-    border-left: 1px solid #262626;
-    padding: 0px 0px 0px 4px;
-    color: #ffffff;
-    font-weight: normal;
+}
+
+.more-link-expander {
+    background-image: url("section-more.svg");
+    width: 9px;
+    height: 9px;
 }
 
 .dash-pane {

diff --git a/data/theme/section-more.svg b/data/theme/section-more.svg
new file mode 100755 (executable)
index 0000000..74f579d
--- /dev/null
+++ b/data/theme/section-more.svg
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="5.8600588"
+   height="9"
+   id="svg3647"
+   version="1.1"
+   inkscape:version="0.46+devel"
+   sodipodi:docname="New document 6">
+  <defs
+     id="defs3649">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective3655" />
+    <inkscape:perspective
+       id="perspective3603"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="112.21575"
+     inkscape:cy="-32.642856"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="609"
+     inkscape:window-height="501"
+     inkscape:window-x="164"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata3652">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-262.78425,-490.71933)">
+    <path
+       transform="matrix(0,0.98149546,-0.71467449,0,506.02358,412.28296)"
+       d="M 88.830127,340 80.169873,340 84.5,332.5 88.830127,340 z"
+       inkscape:randomized="0"
+       inkscape:rounded="0"
+       inkscape:flatsided="true"
+       sodipodi:arg2="1.5707963"
+       sodipodi:arg1="0.52359878"
+       sodipodi:r2="2.5"
+       sodipodi:r1="5"
+       sodipodi:cy="337.5"
+       sodipodi:cx="84.5"
+       sodipodi:sides="3"
+       id="path5497-5"
+       style="fill:#5f5f5f;fill-opacity:1;stroke:#5f5f5f;stroke-width:0.59699643;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       sodipodi:type="star" />
+  </g>
+</svg>

diff --git a/js/ui/dash.js b/js/ui/dash.js
index 89a54928104c41a1cd608b78902b09131cb34776..fd5d947a99414a25de4e30995c2bcf2a7ec12cbb 100644 (file)
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -345,8 +345,8 @@ MoreLink.prototype = {
                                         reactive: true });
         this.pane = null;
 
-        let text = new St.Label({ text: _("More") });
-        this.actor.add(text, { expand: true, y_fill: false });
+        let expander = new St.Bin({ style_class: "more-link-expander" });
+        this.actor.add(expander, { expand: true, y_fill: false });
 
         this.actor.connect('button-press-event', Lang.bind(this, function (b, e) {
             if (this.pane == null) {